bitkeeper revision 1.1159.170.81 (41df3d62qbgOxejO_eV2MdPu54MhSA)

Revert bogus shadow 'fix'.

diff --git a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c
index aa4afc3cda06c65a388259cc4a8a348601888bcc..41ac65177a1b02c2e4bfc029d0290db016a07ca0 100644 (file)
--- a/xen/arch/x86/shadow.c
+++ b/xen/arch/x86/shadow.c
@@ -517,10 +517,10 @@ static void shadow_map_l1_into_current_l2(unsigned long va)
             mk_l2_pgentry(spde);
 
         gpl1e = (unsigned long *) &(linear_pg_table[
-            (va>>L1_PAGETABLE_SHIFT) & (ENTRIES_PER_L1_PAGETABLE-1)]);
+            (va>>L1_PAGETABLE_SHIFT) & ~(ENTRIES_PER_L1_PAGETABLE-1)]);
 
         spl1e = (unsigned long *) &(shadow_linear_pg_table[
-            (va>>L1_PAGETABLE_SHIFT) & (ENTRIES_PER_L1_PAGETABLE-1)]);
+            (va>>L1_PAGETABLE_SHIFT) & ~(ENTRIES_PER_L1_PAGETABLE-1)]);
 
         for ( i = 0; i < ENTRIES_PER_L1_PAGETABLE; i++ )
             l1pte_propagate_from_guest(m, &gpl1e[i], &spl1e[i]);